Merge with xen-ia64-unstable.hg.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 21 Dec 2005 18:52:00 +0000 (19:52 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 21 Dec 2005 18:52:00 +0000 (19:52 +0100)

Trivial merge